API-1835: wires event handlers for informers by p0lyn0mial · Pull Request #7559 · openshift/hypershift

p0lyn0mial · 2026-01-21T12:02:12Z

please review feat(openshiftmanager-phase2): wire event handlers for informers only

Adds an input resource initializer runnable for OpenShiftManager that discovers input resources and wires informers, and registers it in the controller setup. Notes: discovery is still a stub and we still need to register informer handlers and add filtering.

inputResourceDispatcher is a simple dispatcher that applies GVK scoped filters and forwards matching events. Each GVK has its own set of filters. Today these may include name/namespace checks, and in the future label selectors. Longer term, this dispatcher is expected to track which input resources are associated with which operator.

prepares matchers to filter cluster(s) resources based on inputResources

refactors tests so that they use a common function for getting a RESTMapper

registers an event handler for an informer per gvk and passed evnents to the event dispatcher

openshift-ci-robot · 2026-01-21T12:02:17Z

@p0lyn0mial: This pull request references API-1835 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the epic to target the "4.22.0" version, but no target version was set.

Details

In response to this:

requires #7477 , #7477 and #7543

please review feat(openshiftmanager-phase2): wire event handlers for informers only

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

coderabbitai · 2026-01-21T12:02:21Z

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)

do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

openshift-ci · 2026-01-21T12:02:22Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

openshift-merge-robot · 2026-01-21T12:02:23Z

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

p0lyn0mial · 2026-01-21T12:02:30Z

/assign @benluddy @bertinatto @csrwng

openshift-ci · 2026-01-21T12:04:38Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: p0lyn0mial
Once this PR has been reviewed and has the lgtm label, please assign devguyio for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-bot · 2026-04-17T01:30:06Z

Stale PRs are closed after 21d of inactivity.

If this PR is still relevant, comment to refresh it or remove the stale label.
Mark the PR as fresh by commenting /remove-lifecycle stale.

If this PR is safe to close now please do so with /close.

/lifecycle stale

openshift-bot · 2026-05-02T02:00:41Z

Stale PRs rot after 14d of inactivity.

Mark the PR as fresh by commenting /remove-lifecycle rotten.
Rotten PRs close after an additional 7d of inactivity.

If this PR is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

openshift-ci · 2026-05-11T17:50:49Z

@p0lyn0mial: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/unit	`9b5be46`	link	true	`/test unit`
ci/prow/e2e-azure-self-managed	`9b5be46`	link	true	`/test e2e-azure-self-managed`
ci/prow/verify-workflows	`9b5be46`	link	true	`/test verify-workflows`
ci/prow/security	`9b5be46`	link	true	`/test security`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

hypershift-jira-solve-ci · 2026-05-11T23:20:41Z

Test Failure Analysis Complete

Job Information

Prow Job: pull-ci-openshift-hypershift-main-security
Build ID: 2053895476914163712
PR: API-1835: wires event handlers for informers #7559 (API-1835: wires event handlers for informers)
PR SHA: 9b5be46
Base SHA: f16ca0d
Base Ref: main

Test Failure Analysis

Error

Auto-merging control-plane-operator/controllers/openshiftmanager/input_resource_initializer.go
CONFLICT (add/add): Merge conflict in control-plane-operator/controllers/openshiftmanager/input_resource_initializer.go
Auto-merging control-plane-operator/controllers/openshiftmanager/input_resource_initializer_test.go
CONFLICT (add/add): Merge conflict in control-plane-operator/controllers/openshiftmanager/input_resource_initializer_test.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Automatic merge failed; fix conflicts and then commit the result.

Summary

The security job failed during the git clone/merge phase before any CI steps or tests executed. Prow attempted to merge PR #7559 (commit 9b5be46) into the main branch (at f16ca0d) and encountered add/add and content merge conflicts in 5 files. Because the merge could not be completed, the job exited immediately with no final SHA produced and 0 seconds of runtime. No security scan or test was ever run.

Root Cause

The PR branch (9b5be46) has diverged from the current main branch (f16ca0d) and both sides have introduced conflicting changes in the same files. Specifically:

control-plane-operator/controllers/openshiftmanager/input_resource_initializer.go — add/add conflict: Both the PR and a recently-merged commit on main (likely PR NO-JIRA: Document CEL over webhooks policy for AI agents #8478 bryan-cox/update-agents-on-webhook) added this file or added content at the same location, and git cannot auto-resolve which version to keep.
control-plane-operator/controllers/openshiftmanager/input_resource_initializer_test.go — add/add conflict: Same as above for the corresponding test file.
go.mod — content conflict: Both sides modified dependency declarations in go.mod at overlapping lines.
go.sum — content conflict: Consequent hash changes from the go.mod conflicts.
vendor/modules.txt — content conflict: Vendored module metadata diverged on both sides.

The recently-merged PR #8478 (Merge pull request #8478 from bryan-cox/update-agents-on-webhook) is the main HEAD commit. This PR likely introduced the input_resource_initializer.go file or modified it in a way that directly conflicts with the same file introduced by PR #7559. This is a straightforward merge conflict — the PR branch needs to be rebased onto the current main.

Recommendations

Rebase PR API-1835: wires event handlers for informers #7559 onto current main: The PR author should run git fetch origin && git rebase origin/main and resolve the conflicts in the 5 affected files.
Resolve the input_resource_initializer.go add/add conflict first: Since both sides added this file, the author needs to manually merge the content from the main version (from PR NO-JIRA: Document CEL over webhooks policy for AI agents #8478) with their PR's version. This is the most critical conflict.
Re-vendor after resolving go.mod: After resolving go.mod conflicts, run go mod tidy && go mod vendor to regenerate go.sum and vendor/modules.txt cleanly rather than manually resolving those files.
Push the rebased branch to trigger a new CI run — the security job will then be able to merge cleanly and actually execute the security scan.

Evidence

Evidence	Detail
Failure phase	Git merge (pre-CI, before any test or security scan ran)
Exit status	`exit status 1` from `git merge --no-ff`
Total runtime	0 seconds (no CI steps executed)
Final SHA	Empty (merge never completed)
Conflicting files	`input_resource_initializer.go`, `input_resource_initializer_test.go`, `go.mod`, `go.sum`, `vendor/modules.txt`
Conflict type (source files)	`add/add` — both PR and main introduced the same files
Conflict type (dependency files)	`content` — overlapping modifications to dependency metadata
PR commit	`9b5be46cfecc182d5984cc4a18ea2fda836c68bd`
Base (main) commit	`f16ca0d22941d58a170aaa4b1471b1456017c7c8`
Last merged PR on main	PR #8478 (`bryan-cox/update-agents-on-webhook`)

openshift-ci · 2026-05-19T02:30:10Z

Rotten PRs close after 7d of inactivity.

Reopen the PR by commenting /reopen.
Mark the PR as fresh by commenting /remove-lifecycle rotten.

/close

openshift-ci · 2026-05-19T02:30:51Z

@openshift-ci[bot]: Closed this PR.

Details

In response to this:

Rotten PRs close after 7d of inactivity.

Reopen the PR by commenting /reopen.
Mark the PR as fresh by commenting /remove-lifecycle rotten.

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

p0lyn0mial added 6 commits January 15, 2026 10:23

bump deps

1b3ac89

feat(openshiftmanager-phase2): intro buildInputResourceFilters

1612224

prepares matchers to filter cluster(s) resources based on inputResources

feat(openshiftmanager-phase2): remove fakeRESTMapperFor

efc86c9

refactors tests so that they use a common function for getting a RESTMapper

feat(openshiftmanager-phase2): wire event handlers for informers

9b5be46

registers an event handler for an informer per gvk and passed evnents to the event dispatcher

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 21, 2026

openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 21, 2026

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 21, 2026

openshift-ci Bot added the do-not-merge/needs-area label Jan 21, 2026

openshift-ci Bot assigned benluddy, bertinatto and csrwng Jan 21, 2026

openshift-ci Bot added the area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release label Jan 21, 2026

openshift-ci Bot removed the do-not-merge/needs-area label Jan 21, 2026

openshift-ci Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Apr 17, 2026

openshift-ci Bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels May 2, 2026

openshift-ci Bot closed this May 19, 2026

Navigation Menu

Uh oh!

API-1835: wires event handlers for informers - #7559

API-1835: wires event handlers for informers#7559
p0lyn0mial wants to merge 6 commits into
openshift:mainfrom
p0lyn0mial:om-phase-2-inf-event-handlers

p0lyn0mial commented Jan 21, 2026

Uh oh!

openshift-ci-robot commented Jan 21, 2026 •

edited by openshift-ci Bot

Loading

Uh oh!

coderabbitai Bot commented Jan 21, 2026 •

edited

Loading

Review skipped

Uh oh!

openshift-ci Bot commented Jan 21, 2026

Uh oh!

openshift-merge-robot commented Jan 21, 2026

Uh oh!

p0lyn0mial commented Jan 21, 2026

Uh oh!

openshift-ci Bot commented Jan 21, 2026

Uh oh!

openshift-bot commented Apr 17, 2026

Uh oh!

openshift-bot commented May 2, 2026

Uh oh!

openshift-ci Bot commented May 11, 2026

Uh oh!

hypershift-jira-solve-ci Bot commented May 11, 2026 •

edited by openshift-ci Bot

Loading

Uh oh!

openshift-ci Bot commented May 19, 2026

Uh oh!

openshift-ci Bot commented May 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

p0lyn0mial commented Jan 21, 2026

Uh oh!

openshift-ci-robot commented Jan 21, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai Bot commented Jan 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci Bot commented Jan 21, 2026

Uh oh!

openshift-merge-robot commented Jan 21, 2026

Uh oh!

p0lyn0mial commented Jan 21, 2026

Uh oh!

openshift-ci Bot commented Jan 21, 2026

Uh oh!

openshift-bot commented Apr 17, 2026

Uh oh!

openshift-bot commented May 2, 2026

Uh oh!

openshift-ci Bot commented May 11, 2026

Uh oh!

hypershift-jira-solve-ci Bot commented May 11, 2026 • edited by openshift-ci Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Failure Analysis Complete

Job Information

Test Failure Analysis

Error

Summary

Uh oh!

openshift-ci Bot commented May 19, 2026

Uh oh!

openshift-ci Bot commented May 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

openshift-ci-robot commented Jan 21, 2026 •

edited by openshift-ci Bot

Loading

coderabbitai Bot commented Jan 21, 2026 •

edited

Loading

hypershift-jira-solve-ci Bot commented May 11, 2026 •

edited by openshift-ci Bot

Loading